-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8371381: [Shenandoah] Setting ergo flags should use FLAG_SET_ERGO #28242
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
👋 Welcome back rgithubli! A progress list of the required criteria for merging this PR into |
|
@rgithubli This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 82 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@ysramakrishna, @JohnTortugo, @pengxiaolong, @earthling-amzn) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
|
@rgithubli The following labels will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed the ergo flg setting macro changes. They look good to me.
For the passive mode that requires allowing evac reserve of 0, I'll request @kdnilsen or @earthling-amzn to review.
/reviewers 2
|
@ysramakrishna |
|
Hmm, setting |
| @@ -353,7 +353,7 @@ | |||
| "evacuation collection set (comprised of both young and old " \ | |||
| "regions) is also bounded by this parameter. In percents of " \ | |||
| "total (young-generation) heap size.") \ | |||
| range(1,100) \ | |||
| range(0,100) \ | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we allow this, somebody will file a bug because -XX:ShenandoahEvacReserve=0 will cause other modes to crash with divide by zero error.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I'll keep the range as it is (1,100), but instead of setting the default with ergo at here:
jdk/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
Lines 40 to 42 in c6a8027
| if (!ShenandoahDegeneratedGC) { | |
| SHENANDOAH_ERGO_OVERRIDE_DEFAULT(ShenandoahEvacReserve, 0); | |
| } |
FLAG_SET_DEFAULT to bypass the check? We wouldn't have the data source origin in passive mode which is only meant to be diagnostic, but that's better than causing problems in the regular mode.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, missed your general comment above. I think we're talking about the same solution. I'll update the passive mode to use FLAG_SET_DEFAULT.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, that's what I was suggesting. Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we put the lower bound back to 1 now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, forgot. Updating.
|
GHA test It passed on my local. Rerun on GHA and check hs_err log. Should be a non related compiler issue. Opened a JBS: https://bugs.openjdk.org/browse/JDK-8371747 |
earthling-amzn
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
|
/integrate |
|
@rgithubli |
|
/sponsor |
|
Going to push as commit 2199b5f.
Your commit was automatically rebased without conflicts. |
|
@pengxiaolong @rgithubli Pushed as commit 2199b5f. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Setting ergo flags using
FLAG_SET_ERGO, instead ofFLAG_SET_DEFAULT, so we can have the right origin info.For
ShenandoahEvacReservechange: when we use shenandoah passive mode and degen is also turned off (-XX:ShenandoahGCMode=passive -XX:-ShenandoahDegeneratedGC), we set the ShenandoahEvacReserve to 0:jdk/src/hotspot/share/gc/shenandoah/mode/shenandoahPassiveMode.cpp
Lines 40 to 42 in c6a8027
FLAG_SET_DEFAULTdoesn't check the range butFLAG_SET_ERGOdoes so some of the jtreg would fail because of this change. Had to move this ergo setting to regularFLAG_SET_DEFAULT.Testing: jtreg gc. GHA pending.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/28242/head:pull/28242$ git checkout pull/28242Update a local copy of the PR:
$ git checkout pull/28242$ git pull https://git.openjdk.org/jdk.git pull/28242/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 28242View PR using the GUI difftool:
$ git pr show -t 28242Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/28242.diff
Using Webrev
Link to Webrev Comment